From 69300df1fc94e6dbaea0f9c2c9215eb45d345a80 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 25 Apr 2011 01:48:59 +0200 Subject: [PATCH] label: Allow using more underline modes --- gtk/gtklabel.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 2fb4dc9f0e..3b6504e346 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -1346,8 +1346,16 @@ attribute_from_text (GtkBuilder *builder, attribute = pango_attr_stretch_new (g_value_get_enum (&val)); break; case PANGO_ATTR_UNDERLINE: - if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) - attribute = pango_attr_underline_new (g_value_get_boolean (&val)); + if (gtk_builder_value_from_string_type (builder, PANGO_TYPE_UNDERLINE, value, &val, NULL)) + attribute = pango_attr_underline_new (g_value_get_enum (&val)); + else + { + /* XXX: allow boolean for backwards compat, so ignore error */ + /* Deprecate this somehow */ + g_value_unset (&val); + if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) + attribute = pango_attr_underline_new (g_value_get_boolean (&val)); + } break; case PANGO_ATTR_STRIKETHROUGH: if (gtk_builder_value_from_string_type (builder, G_TYPE_BOOLEAN, value, &val, error)) -- 2.30.2